From d7e368ac0e171410922ceb0c7121a2450a793429 Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Tue, 16 Aug 2016 14:22:47 -0700 Subject: [PATCH] Update OOjs UI to v0.17.8 Release notes: https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.17.8 Change-Id: I03793872885c70cabd1abd550b12d89e6e509e94 --- composer.json | 2 +- resources/lib/oojs-ui/i18n/ckb.json | 7 +- resources/lib/oojs-ui/i18n/da.json | 8 +- resources/lib/oojs-ui/i18n/diq.json | 17 +- resources/lib/oojs-ui/oojs-ui-apex.js | 4 +- resources/lib/oojs-ui/oojs-ui-core-apex.css | 76 ++++- .../lib/oojs-ui/oojs-ui-core-mediawiki.css | 90 +++++- resources/lib/oojs-ui/oojs-ui-core.js | 127 +++++++- resources/lib/oojs-ui/oojs-ui-mediawiki.js | 8 +- .../lib/oojs-ui/oojs-ui-toolbars-apex.css | 4 +- .../oojs-ui/oojs-ui-toolbars-mediawiki.css | 75 ++--- resources/lib/oojs-ui/oojs-ui-toolbars.js | 4 +- .../lib/oojs-ui/oojs-ui-widgets-apex.css | 267 +++++++--------- .../lib/oojs-ui/oojs-ui-widgets-mediawiki.css | 290 +++++++----------- resources/lib/oojs-ui/oojs-ui-widgets.js | 101 +----- .../lib/oojs-ui/oojs-ui-windows-apex.css | 5 +- .../lib/oojs-ui/oojs-ui-windows-mediawiki.css | 5 +- resources/lib/oojs-ui/oojs-ui-windows.js | 4 +- 18 files changed, 559 insertions(+), 535 deletions(-) diff --git a/composer.json b/composer.json index 90f706328a..956739dfc4 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "ext-xml": "*", "liuggio/statsd-php-client": "1.0.18", "mediawiki/at-ease": "1.1.0", - "oojs/oojs-ui": "0.17.7", + "oojs/oojs-ui": "0.17.8", "oyejorge/less.php": "1.7.0.10", "php": ">=5.5.9", "psr/log": "1.0.0", diff --git a/resources/lib/oojs-ui/i18n/ckb.json b/resources/lib/oojs-ui/i18n/ckb.json index d2a998c005..999fae047a 100644 --- a/resources/lib/oojs-ui/i18n/ckb.json +++ b/resources/lib/oojs-ui/i18n/ckb.json @@ -4,7 +4,8 @@ "Calak", "Muhammed taha", "Serwan", - "Pirehelokan" + "Pirehelokan", + "Sarchia" ] }, "ooui-toolbar-more": "زیاتر", @@ -16,5 +17,7 @@ "ooui-dialog-process-dismiss": "لێگەڕان", "ooui-dialog-process-retry": "دیسان ھەوڵ بدە", "ooui-dialog-process-continue": "درێژە بدە", - "ooui-selectfile-placeholder": "ھیچ فایلێک ھەڵنەبژێراوە" + "ooui-selectfile-button-select": "پەڕگەیەک دەستنیشان بکە", + "ooui-selectfile-placeholder": "ھیچ فایلێک ھەڵنەبژێراوە", + "ooui-selectfile-dragdrop-placeholder": "پەڕگەکان بخەرە ئێرە" } diff --git a/resources/lib/oojs-ui/i18n/da.json b/resources/lib/oojs-ui/i18n/da.json index 30e3efaed2..e193fb0a45 100644 --- a/resources/lib/oojs-ui/i18n/da.json +++ b/resources/lib/oojs-ui/i18n/da.json @@ -8,12 +8,18 @@ "Palnatoke", "Simeondahl", "Tehnix", - "Macofe" + "Macofe", + "Peter Alberti" ] }, "ooui-outline-control-move-down": "Flyt ned", "ooui-outline-control-move-up": "Flyt op", "ooui-toolbar-more": "Mere", "ooui-toolgroup-expand": "Mere", + "ooui-toolgroup-collapse": "Færre", + "ooui-dialog-message-accept": "OK", + "ooui-dialog-message-reject": "Afbryd", + "ooui-dialog-process-error": "Noget gik galt", + "ooui-dialog-process-retry": "Prøv igen", "ooui-dialog-process-continue": "Fortsæt" } diff --git a/resources/lib/oojs-ui/i18n/diq.json b/resources/lib/oojs-ui/i18n/diq.json index 881ff67414..bf6b087337 100644 --- a/resources/lib/oojs-ui/i18n/diq.json +++ b/resources/lib/oojs-ui/i18n/diq.json @@ -6,11 +6,24 @@ "Kghbln", "Marmase", "Mirzali", - "Se4598" + "Se4598", + "Kumkumuk" ] }, "ooui-outline-control-move-down": "Bendi bere cêr", "ooui-outline-control-move-up": "Bendi bere cor", "ooui-outline-control-remove": "Obcey wedare", - "ooui-toolbar-more": "Zewbi" + "ooui-toolbar-more": "Zewbi", + "ooui-toolgroup-expand": "Dehana", + "ooui-toolgroup-collapse": "Deha tayn", + "ooui-dialog-message-accept": "TEMAM", + "ooui-dialog-message-reject": "Bıtexelne", + "ooui-dialog-process-error": "Tayê çi ğelet şi...", + "ooui-dialog-process-dismiss": "Racın", + "ooui-dialog-process-retry": "Fına bıcerbın", + "ooui-dialog-process-continue": "Dewam ke", + "ooui-selectfile-button-select": "Yu dosya weçinê", + "ooui-selectfile-not-supported": "Dosya weçinayış desteg nêvine na", + "ooui-selectfile-placeholder": "Dosya nêwçineya", + "ooui-selectfile-dragdrop-placeholder": "Dosya tiyara ake" } diff --git a/resources/lib/oojs-ui/oojs-ui-apex.js b/resources/lib/oojs-ui/oojs-ui-apex.js index 6a38d0d9f6..b272331605 100644 --- a/resources/lib/oojs-ui/oojs-ui-apex.js +++ b/resources/lib/oojs-ui/oojs-ui-apex.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.17.7 + * OOjs UI v0.17.8 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-08-03T16:38:22Z + * Date: 2016-08-16T21:13:48Z */ ( function ( OO ) { diff --git a/resources/lib/oojs-ui/oojs-ui-core-apex.css b/resources/lib/oojs-ui/oojs-ui-core-apex.css index 72591ccc4a..c13ac7af93 100644 --- a/resources/lib/oojs-ui/oojs-ui-core-apex.css +++ b/resources/lib/oojs-ui/oojs-ui-core-apex.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.17.7 + * OOjs UI v0.17.8 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-08-03T16:38:27Z + * Date: 2016-08-16T21:13:53Z */ .oo-ui-element-hidden { display: none !important; @@ -16,7 +16,8 @@ cursor: pointer; display: inline-block; vertical-align: middle; - font: inherit; + font-family: inherit; + font-size: inherit; line-height: normal; white-space: nowrap; -webkit-touch-callout: none; @@ -361,8 +362,8 @@ color: #d45353; } .oo-ui-fieldLayout-messages .oo-ui-labelWidget { - padding: 0; - line-height: 1.875em; + padding: 0.1em 0; + line-height: 1.5em; vertical-align: middle; } .oo-ui-actionFieldLayout { @@ -932,6 +933,8 @@ } .oo-ui-menuSelectWidget { position: absolute; + width: 100%; + z-index: 4; background-color: #ffffff; margin-top: -1px; border: 1px solid #cccccc; @@ -1000,10 +1003,6 @@ .oo-ui-dropdownWidget.oo-ui-widget-enabled .oo-ui-dropdownWidget-handle { cursor: pointer; } -.oo-ui-dropdownWidget > .oo-ui-menuSelectWidget { - z-index: 1; - width: 100%; -} .oo-ui-dropdownWidget:last-child { margin-right: 0; } @@ -1054,10 +1053,6 @@ max-width: 50em; margin-right: 0.5em; } -.oo-ui-comboBoxInputWidget > .oo-ui-menuSelectWidget { - z-index: 1; - width: 100%; -} .oo-ui-comboBoxInputWidget.oo-ui-widget-enabled > .oo-ui-indicatorElement-indicator { cursor: pointer; } @@ -1118,3 +1113,58 @@ .oo-ui-checkboxMultioptionWidget .oo-ui-checkboxInputWidget { margin-right: 0; } +.oo-ui-progressBarWidget { + max-width: 50em; + background-color: #ffffff; + border: 1px solid #cccccc; + border-radius: 0.25em; + overflow: hidden; +} +.oo-ui-progressBarWidget-bar { + height: 1em; + border-right: 1px solid #cccccc; + -webkit-transition: width 250ms ease, margin-left 250ms ease; + -moz-transition: width 250ms ease, margin-left 250ms ease; + transition: width 250ms ease, margin-left 250ms ease; + background-color: #cde7f4; + background-image: -webkit-gradient(linear, right top, right bottom, color-stop(0, #eaf4fa), color-stop(100%, #b0d9ee)); + background-image: -webkit-linear-gradient(top, #eaf4fa 0, #b0d9ee 100%); + background-image: -moz-linear-gradient(top, #eaf4fa 0, #b0d9ee 100%); + background-image: linear-gradient(to bottom, #eaf4fa 0, #b0d9ee 100%); + -ms-filter: "progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffeaf4fa', endColorstr='#ffb0d9ee' )"; +} +.oo-ui-progressBarWidget-indeterminate .oo-ui-progressBarWidget-bar { + -webkit-animation: oo-ui-progressBarWidget-slide 2s infinite linear; + -moz-animation: oo-ui-progressBarWidget-slide 2s infinite linear; + animation: oo-ui-progressBarWidget-slide 2s infinite linear; + width: 40%; + margin-left: -10%; + border-left: 1px solid #a6cee1; +} +.oo-ui-progressBarWidget.oo-ui-widget-disabled { + opacity: 0.6; +} +@-webkit-keyframes oo-ui-progressBarWidget-slide { + from { + margin-left: -40%; + } + to { + margin-left: 100%; + } +} +@-moz-keyframes oo-ui-progressBarWidget-slide { + from { + margin-left: -40%; + } + to { + margin-left: 100%; + } +} +@keyframes oo-ui-progressBarWidget-slide { + from { + margin-left: -40%; + } + to { + margin-left: 100%; + } +} diff --git a/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css index 23ecccda71..4e8f65c66c 100644 --- a/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css +++ b/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.17.7 + * OOjs UI v0.17.8 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-08-03T16:38:27Z + * Date: 2016-08-16T21:13:53Z */ .oo-ui-element-hidden { display: none !important; @@ -16,7 +16,8 @@ cursor: pointer; display: inline-block; vertical-align: middle; - font: inherit; + font-family: inherit; + font-size: inherit; line-height: normal; white-space: nowrap; -webkit-touch-callout: none; @@ -62,6 +63,7 @@ margin-left: 0; } .oo-ui-buttonElement.oo-ui-iconElement > .oo-ui-buttonElement-button > .oo-ui-indicatorElement-indicator { + margin-right: 0.25em; margin-left: 0.46875em; } .oo-ui-buttonElement-frameless > .oo-ui-buttonElement-button .oo-ui-indicatorElement-indicator { @@ -185,11 +187,15 @@ .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-buttonElement-pressed > .oo-ui-buttonElement-button { background-color: #d9d9d9; border-color: #d9d9d9; - box-shadow: none; } .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-buttonElement-active > .oo-ui-buttonElement-button { background-color: #999999; color: #ffffff; + border-color: #999999; + z-index: 3; +} +.oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-buttonElement-active > .oo-ui-buttonElement-button:focus { + border-color: #347bff; } .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button { color: #347bff; @@ -451,8 +457,8 @@ } .oo-ui-fieldLayout-messages .oo-ui-labelWidget { display: table-cell; - padding: 0; - line-height: 1.875; + padding: 0.1em 0; + line-height: 1.5; vertical-align: middle; } .oo-ui-actionFieldLayout { @@ -700,6 +706,10 @@ border-bottom-right-radius: 2px; border-top-right-radius: 2px; } +.oo-ui-buttonGroupWidget.oo-ui-widget-enabled .oo-ui-buttonElement .oo-ui-buttonElement-button:focus { + border-color: #347bff; + z-index: 3; +} .oo-ui-popupWidget { position: absolute; /* @noflip */ @@ -1225,6 +1235,8 @@ } .oo-ui-menuSelectWidget { position: absolute; + width: 100%; + z-index: 4; background-color: #ffffff; margin-top: -1px; border: 1px solid #aaaaaa; @@ -1275,7 +1287,6 @@ position: relative; width: 100%; max-width: 50em; - background-color: #ffffff; margin-right: 0.5em; } .oo-ui-dropdownWidget-handle { @@ -1301,10 +1312,6 @@ .oo-ui-dropdownWidget.oo-ui-widget-enabled .oo-ui-dropdownWidget-handle { cursor: pointer; } -.oo-ui-dropdownWidget > .oo-ui-menuSelectWidget { - z-index: 1; - width: 100%; -} .oo-ui-dropdownWidget:last-child { margin-right: 0; } @@ -1328,7 +1335,13 @@ .oo-ui-dropdownWidget-handle .oo-ui-labelElement-label { margin: 0 1em; } -.oo-ui-dropdownWidget:hover .oo-ui-dropdownWidget-handle { +.oo-ui-dropdownWidget.oo-ui-widget-enabled .oo-ui-dropdownWidget-handle { + background-color: #ffffff; + -webkit-transition: border-color 100ms; + -moz-transition: border-color 100ms; + transition: border-color 100ms; +} +.oo-ui-dropdownWidget.oo-ui-widget-enabled:hover .oo-ui-dropdownWidget-handle { border-color: #aaaaaa; } .oo-ui-dropdownWidget.oo-ui-widget-disabled .oo-ui-dropdownWidget-handle { @@ -1356,10 +1369,6 @@ max-width: 50em; margin-right: 0.5em; } -.oo-ui-comboBoxInputWidget > .oo-ui-menuSelectWidget { - z-index: 1; - width: 100%; -} .oo-ui-comboBoxInputWidget.oo-ui-widget-enabled > .oo-ui-indicatorElement-indicator { cursor: pointer; } @@ -1419,3 +1428,52 @@ .oo-ui-checkboxMultioptionWidget .oo-ui-checkboxInputWidget { margin-right: 0; } +.oo-ui-progressBarWidget { + max-width: 50em; + background-color: #ffffff; + border: 1px solid #cccccc; + border-radius: 2px; + overflow: hidden; +} +.oo-ui-progressBarWidget-bar { + background-color: #dddddd; + height: 1em; + -webkit-transition: width 200ms, margin-left 200ms; + -moz-transition: width 200ms, margin-left 200ms; + transition: width 200ms, margin-left 200ms; +} +.oo-ui-progressBarWidget-indeterminate .oo-ui-progressBarWidget-bar { + -webkit-animation: oo-ui-progressBarWidget-slide 2s infinite linear; + -moz-animation: oo-ui-progressBarWidget-slide 2s infinite linear; + animation: oo-ui-progressBarWidget-slide 2s infinite linear; + width: 40%; + margin-left: -10%; + border-left-width: 1px; +} +.oo-ui-progressBarWidget.oo-ui-widget-disabled { + opacity: 0.6; +} +@-webkit-keyframes oo-ui-progressBarWidget-slide { + from { + margin-left: -40%; + } + to { + margin-left: 100%; + } +} +@-moz-keyframes oo-ui-progressBarWidget-slide { + from { + margin-left: -40%; + } + to { + margin-left: 100%; + } +} +@keyframes oo-ui-progressBarWidget-slide { + from { + margin-left: -40%; + } + to { + margin-left: 100%; + } +} diff --git a/resources/lib/oojs-ui/oojs-ui-core.js b/resources/lib/oojs-ui/oojs-ui-core.js index 4d32961d66..cd1a3de0a7 100644 --- a/resources/lib/oojs-ui/oojs-ui-core.js +++ b/resources/lib/oojs-ui/oojs-ui-core.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.17.7 + * OOjs UI v0.17.8 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-08-03T16:38:22Z + * Date: 2016-08-16T21:13:48Z */ ( function ( OO ) { @@ -2026,6 +2026,7 @@ OO.ui.mixin.ButtonElement.prototype.toggleFramed = function ( framed ) { OO.ui.mixin.ButtonElement.prototype.setActive = function ( value ) { this.active = !!value; this.$element.toggleClass( 'oo-ui-buttonElement-active', this.active ); + this.updateThemeClasses(); return this; }; @@ -7325,6 +7326,103 @@ OO.ui.FloatingMenuSelectWidget.prototype.toggle = function ( visible ) { return this; }; +/** + * Progress bars visually display the status of an operation, such as a download, + * and can be either determinate or indeterminate: + * + * - **determinate** process bars show the percent of an operation that is complete. + * + * - **indeterminate** process bars use a visual display of motion to indicate that an operation + * is taking place. Because the extent of an indeterminate operation is unknown, the bar does + * not use percentages. + * + * The value of the `progress` configuration determines whether the bar is determinate or indeterminate. + * + * @example + * // Examples of determinate and indeterminate progress bars. + * var progressBar1 = new OO.ui.ProgressBarWidget( { + * progress: 33 + * } ); + * var progressBar2 = new OO.ui.ProgressBarWidget(); + * + * // Create a FieldsetLayout to layout progress bars + * var fieldset = new OO.ui.FieldsetLayout; + * fieldset.addItems( [ + * new OO.ui.FieldLayout( progressBar1, {label: 'Determinate', align: 'top'}), + * new OO.ui.FieldLayout( progressBar2, {label: 'Indeterminate', align: 'top'}) + * ] ); + * $( 'body' ).append( fieldset.$element ); + * + * @class + * @extends OO.ui.Widget + * + * @constructor + * @param {Object} [config] Configuration options + * @cfg {number|boolean} [progress=false] The type of progress bar (determinate or indeterminate). + * To create a determinate progress bar, specify a number that reflects the initial percent complete. + * By default, the progress bar is indeterminate. + */ +OO.ui.ProgressBarWidget = function OoUiProgressBarWidget( config ) { + // Configuration initialization + config = config || {}; + + // Parent constructor + OO.ui.ProgressBarWidget.parent.call( this, config ); + + // Properties + this.$bar = $( '
' ); + this.progress = null; + + // Initialization + this.setProgress( config.progress !== undefined ? config.progress : false ); + this.$bar.addClass( 'oo-ui-progressBarWidget-bar' ); + this.$element + .attr( { + role: 'progressbar', + 'aria-valuemin': 0, + 'aria-valuemax': 100 + } ) + .addClass( 'oo-ui-progressBarWidget' ) + .append( this.$bar ); +}; + +/* Setup */ + +OO.inheritClass( OO.ui.ProgressBarWidget, OO.ui.Widget ); + +/* Static Properties */ + +OO.ui.ProgressBarWidget.static.tagName = 'div'; + +/* Methods */ + +/** + * Get the percent of the progress that has been completed. Indeterminate progresses will return `false`. + * + * @return {number|boolean} Progress percent + */ +OO.ui.ProgressBarWidget.prototype.getProgress = function () { + return this.progress; +}; + +/** + * Set the percent of the process completed or `false` for an indeterminate process. + * + * @param {number|boolean} progress Progress percent or `false` for indeterminate + */ +OO.ui.ProgressBarWidget.prototype.setProgress = function ( progress ) { + this.progress = progress; + + if ( progress !== false ) { + this.$bar.css( 'width', this.progress + '%' ); + this.$element.attr( 'aria-valuenow', this.progress ); + } else { + this.$bar.css( 'width', '' ); + this.$element.removeAttr( 'aria-valuenow' ); + } + this.$element.toggleClass( 'oo-ui-progressBarWidget-indeterminate', progress === false ); +}; + /** * InputWidget is the base class for all input widgets, which * include {@link OO.ui.TextInputWidget text inputs}, {@link OO.ui.CheckboxInputWidget checkbox inputs}, @@ -8590,7 +8688,8 @@ OO.ui.TextInputWidget = function OoUiTextInputWidget( config ) { // Events this.$input.on( { keypress: this.onKeyPress.bind( this ), - blur: this.onBlur.bind( this ) + blur: this.onBlur.bind( this ), + focus: this.onFocus.bind( this ) } ); this.$input.one( { focus: this.onElementAttach.bind( this ) @@ -8602,6 +8701,7 @@ OO.ui.TextInputWidget = function OoUiTextInputWidget( config ) { change: 'onChange', disable: 'onDisable' } ); + this.on( 'change', OO.ui.debounce( this.onDebouncedChange.bind( this ), 250 ) ); // Initialization this.$element @@ -8744,6 +8844,16 @@ OO.ui.TextInputWidget.prototype.onBlur = function () { this.setValidityFlag(); }; +/** + * Handle focus events. + * + * @private + * @param {jQuery.Event} e Focus event + */ +OO.ui.TextInputWidget.prototype.onFocus = function () { + this.setValidityFlag( true ); +}; + /** * Handle element attach events. * @@ -8765,10 +8875,19 @@ OO.ui.TextInputWidget.prototype.onElementAttach = function () { */ OO.ui.TextInputWidget.prototype.onChange = function () { this.updateSearchIndicator(); - this.setValidityFlag(); this.adjustSize(); }; +/** + * Handle debounced change events. + * + * @param {string} value + * @private + */ +OO.ui.TextInputWidget.prototype.onDebouncedChange = function () { + this.setValidityFlag(); +}; + /** * Handle disable events. * diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.js b/resources/lib/oojs-ui/oojs-ui-mediawiki.js index ff18605ce5..ab1e9ea4ee 100644 --- a/resources/lib/oojs-ui/oojs-ui-mediawiki.js +++ b/resources/lib/oojs-ui/oojs-ui-mediawiki.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.17.7 + * OOjs UI v0.17.8 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-08-03T16:38:22Z + * Date: 2016-08-16T21:13:48Z */ ( function ( OO ) { @@ -48,9 +48,7 @@ OO.ui.MediaWikiTheme.prototype.getElementClasses = function ( element ) { if ( element.supports( [ 'hasFlag' ] ) ) { isFramed = element.supports( [ 'isFramed' ] ) && element.isFramed(); isActive = element.supports( [ 'isActive' ] ) && element.isActive(); - if ( - ( isFramed && ( isActive || element.isDisabled() || element.hasFlag( 'primary' ) ) ) - ) { + if ( isFramed && ( isActive || element.isDisabled() || element.hasFlag( 'primary' ) ) ) { // Button with a dark background, use white icon variants.invert = true; } else if ( !isFramed && element.isDisabled() ) { diff --git a/resources/lib/oojs-ui/oojs-ui-toolbars-apex.css b/resources/lib/oojs-ui/oojs-ui-toolbars-apex.css index d69ebfafa9..75fd654f19 100644 --- a/resources/lib/oojs-ui/oojs-ui-toolbars-apex.css +++ b/resources/lib/oojs-ui/oojs-ui-toolbars-apex.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.17.7 + * OOjs UI v0.17.8 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-08-03T16:38:27Z + * Date: 2016-08-16T21:13:53Z */ .oo-ui-popupTool .oo-ui-popupWidget-popup, .oo-ui-popupTool .oo-ui-popupWidget-anchor { diff --git a/resources/lib/oojs-ui/oojs-ui-toolbars-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-toolbars-mediawiki.css index 5b60528e6c..0b55308b98 100644 --- a/resources/lib/oojs-ui/oojs-ui-toolbars-mediawiki.css +++ b/resources/lib/oojs-ui/oojs-ui-toolbars-mediawiki.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.17.7 + * OOjs UI v0.17.8 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-08-03T16:38:27Z + * Date: 2016-08-16T21:13:53Z */ .oo-ui-popupTool .oo-ui-popupWidget-popup, .oo-ui-popupTool .oo-ui-popupWidget-anchor { @@ -93,24 +93,21 @@ line-height: 2.1; padding: 0 0.4em; } +.oo-ui-barToolGroup.oo-ui-widget-enabled > .oo-ui-toolGroup-tools > .oo-ui-tool > .oo-ui-tool-link .oo-ui-tool-title { + color: #555555; +} .oo-ui-barToolGroup.oo-ui-widget-enabled > .oo-ui-toolGroup-tools > .oo-ui-tool.oo-ui-widget-enabled:hover { background-color: #eeeeee; } -.oo-ui-barToolGroup.oo-ui-widget-enabled > .oo-ui-toolGroup-tools > .oo-ui-tool > a.oo-ui-tool-link .oo-ui-tool-title { - color: #555555; -} -.oo-ui-barToolGroup.oo-ui-widget-enabled > .oo-ui-toolGroup-tools > .oo-ui-tool.oo-ui-tool-active.oo-ui-widget-enabled { - box-shadow: inset 0 0.07em 0.07em 0 rgba(0, 0, 0, 0.07); +.oo-ui-barToolGroup.oo-ui-widget-enabled > .oo-ui-toolGroup-tools > .oo-ui-tool.oo-ui-widget-enabled.oo-ui-tool-active { background-color: #e5e5e5; + box-shadow: inset 0 0.07em 0.07em 0 rgba(0, 0, 0, 0.07); } -.oo-ui-barToolGroup.oo-ui-widget-enabled > .oo-ui-toolGroup-tools > .oo-ui-tool.oo-ui-tool-active.oo-ui-widget-enabled:hover { +.oo-ui-barToolGroup.oo-ui-widget-enabled > .oo-ui-toolGroup-tools > .oo-ui-tool.oo-ui-widget-enabled.oo-ui-tool-active:hover { background-color: #eeeeee; } -.oo-ui-barToolGroup.oo-ui-widget-enabled > .oo-ui-toolGroup-tools > .oo-ui-tool.oo-ui-widget-disabled > .oo-ui-tool-link .oo-ui-tool-title { - color: #cccccc; -} -.oo-ui-barToolGroup.oo-ui-widget-enabled > .oo-ui-toolGroup-tools > .oo-ui-tool.oo-ui-widget-disabled > .oo-ui-tool-link .oo-ui-iconElement-icon { - opacity: 0.2; +.oo-ui-barToolGroup.oo-ui-widget-enabled > .oo-ui-toolGroup-tools > .oo-ui-tool.oo-ui-widget-enabled.oo-ui-tool-active:active { + background-color: #e5e5e5; } .oo-ui-barToolGroup.oo-ui-widget-enabled > .oo-ui-toolGroup-tools > .oo-ui-tool.oo-ui-widget-enabled > .oo-ui-tool-link .oo-ui-iconElement-icon { opacity: 0.7; @@ -118,13 +115,12 @@ .oo-ui-barToolGroup.oo-ui-widget-enabled > .oo-ui-toolGroup-tools > .oo-ui-tool.oo-ui-widget-enabled:hover > .oo-ui-tool-link .oo-ui-iconElement-icon { opacity: 0.9; } -.oo-ui-barToolGroup.oo-ui-widget-enabled > .oo-ui-toolGroup-tools > .oo-ui-tool.oo-ui-widget-enabled:active { - background-color: #e7e7e7; -} -.oo-ui-barToolGroup.oo-ui-widget-disabled > .oo-ui-toolGroup-tools > .oo-ui-tool > a.oo-ui-tool-link .oo-ui-tool-title { +.oo-ui-barToolGroup.oo-ui-widget-enabled .oo-ui-tool.oo-ui-widget-disabled > .oo-ui-tool-link .oo-ui-tool-title, +.oo-ui-barToolGroup.oo-ui-widget-disabled .oo-ui-tool > .oo-ui-tool-link .oo-ui-tool-title { color: #cccccc; } -.oo-ui-barToolGroup.oo-ui-widget-disabled > .oo-ui-toolGroup-tools > .oo-ui-tool > a.oo-ui-tool-link .oo-ui-iconElement-icon { +.oo-ui-barToolGroup.oo-ui-widget-enabled .oo-ui-tool.oo-ui-widget-disabled > .oo-ui-tool-link .oo-ui-iconElement-icon, +.oo-ui-barToolGroup.oo-ui-widget-disabled .oo-ui-tool > .oo-ui-tool-link .oo-ui-iconElement-icon { opacity: 0.2; } .oo-ui-popupToolGroup { @@ -210,12 +206,6 @@ .oo-ui-toolbar-narrow .oo-ui-popupToolGroup.oo-ui-labelElement.oo-ui-indicatorElement .oo-ui-popupToolGroup-handle .oo-ui-labelElement-label { margin-right: 1.75em; } -.oo-ui-popupToolGroup.oo-ui-widget-enabled .oo-ui-popupToolGroup-handle:hover { - background-color: #eeeeee; -} -.oo-ui-popupToolGroup.oo-ui-widget-enabled .oo-ui-popupToolGroup-handle:active { - background-color: #e5e5e5; -} .oo-ui-popupToolGroup-handle { padding: 0.3125em; height: 2.5em; @@ -242,6 +232,12 @@ .oo-ui-toolbar-narrow .oo-ui-popupToolGroup-handle .oo-ui-iconElement-icon { left: 0; } +.oo-ui-popupToolGroup.oo-ui-widget-enabled .oo-ui-popupToolGroup-handle:hover { + background-color: #eeeeee; +} +.oo-ui-popupToolGroup.oo-ui-widget-enabled .oo-ui-popupToolGroup-handle:active { + background-color: #e5e5e5; +} .oo-ui-popupToolGroup-header { line-height: 2.6; margin: 0 0.6em; @@ -292,9 +288,6 @@ .oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-enabled:hover { background-color: #eeeeee; } -.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-enabled:active { - background-color: #e7e7e7; -} .oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-enabled:hover .oo-ui-tool-link .oo-ui-iconElement-icon { opacity: 0.9; } @@ -305,20 +298,14 @@ .oo-ui-listToolGroup .oo-ui-tool-active.oo-ui-widget-enabled:hover { background-color: #eeeeee; } -.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-tool-title { - color: #cccccc; -} -.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-tool-accel { - color: #dddddd; -} -.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-iconElement-icon { - opacity: 0.2; -} -.oo-ui-listToolGroup.oo-ui-widget-disabled { +.oo-ui-listToolGroup.oo-ui-widget-disabled, +.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-title, +.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-accel { color: #cccccc; } .oo-ui-listToolGroup.oo-ui-widget-disabled .oo-ui-indicatorElement-indicator, -.oo-ui-listToolGroup.oo-ui-widget-disabled .oo-ui-iconElement-icon { +.oo-ui-listToolGroup.oo-ui-widget-disabled .oo-ui-iconElement-icon, +.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-iconElement-icon { opacity: 0.2; } .oo-ui-menuToolGroup .oo-ui-tool { @@ -345,17 +332,13 @@ .oo-ui-menuToolGroup .oo-ui-tool.oo-ui-widget-enabled:hover { background-color: #eeeeee; } -.oo-ui-menuToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-tool-title { - color: #cccccc; -} -.oo-ui-menuToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-iconElement-icon { - opacity: 0.2; -} -.oo-ui-menuToolGroup.oo-ui-widget-disabled { +.oo-ui-menuToolGroup.oo-ui-widget-disabled, +.oo-ui-menuToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-title { color: #cccccc; } .oo-ui-menuToolGroup.oo-ui-widget-disabled .oo-ui-indicatorElement-indicator, -.oo-ui-menuToolGroup.oo-ui-widget-disabled .oo-ui-iconElement-icon { +.oo-ui-menuToolGroup.oo-ui-widget-disabled .oo-ui-iconElement-icon, +.oo-ui-menuToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-iconElement-icon { opacity: 0.2; } .oo-ui-toolbar { diff --git a/resources/lib/oojs-ui/oojs-ui-toolbars.js b/resources/lib/oojs-ui/oojs-ui-toolbars.js index 5254c76c15..18fda5715d 100644 --- a/resources/lib/oojs-ui/oojs-ui-toolbars.js +++ b/resources/lib/oojs-ui/oojs-ui-toolbars.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.17.7 + * OOjs UI v0.17.8 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-08-03T16:38:22Z + * Date: 2016-08-16T21:13:48Z */ ( function ( OO ) { diff --git a/resources/lib/oojs-ui/oojs-ui-widgets-apex.css b/resources/lib/oojs-ui/oojs-ui-widgets-apex.css index a267b7fc29..b0e87af00b 100644 --- a/resources/lib/oojs-ui/oojs-ui-widgets-apex.css +++ b/resources/lib/oojs-ui/oojs-ui-widgets-apex.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.17.7 + * OOjs UI v0.17.8 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-08-03T16:38:27Z + * Date: 2016-08-16T21:13:53Z */ .oo-ui-draggableElement-handle, .oo-ui-draggableElement-handle.oo-ui-widget { @@ -32,10 +32,6 @@ .oo-ui-draggableGroupElement-horizontal .oo-ui-draggableElement { display: inline-block; } -.oo-ui-lookupElement > .oo-ui-menuSelectWidget { - z-index: 1; - width: 100%; -} .oo-ui-bookletLayout-stackLayout.oo-ui-stackLayout-continuous > .oo-ui-panelLayout-scrollable { overflow-y: hidden; } @@ -195,9 +191,6 @@ padding: 0; background-color: transparent; } -.oo-ui-buttonOptionWidget .oo-ui-buttonElement-button { - position: relative; -} .oo-ui-buttonOptionWidget.oo-ui-iconElement .oo-ui-iconElement-icon, .oo-ui-buttonOptionWidget.oo-ui-indicatorElement .oo-ui-indicatorElement-indicator { position: static; @@ -318,61 +311,6 @@ left: 2.25em; margin-left: -2px; } -.oo-ui-progressBarWidget { - max-width: 50em; - background-color: #ffffff; - border: 1px solid #cccccc; - border-radius: 0.25em; - overflow: hidden; -} -.oo-ui-progressBarWidget-bar { - height: 1em; - border-right: 1px solid #cccccc; - -webkit-transition: width 250ms ease, margin-left 250ms ease; - -moz-transition: width 250ms ease, margin-left 250ms ease; - transition: width 250ms ease, margin-left 250ms ease; - background-color: #cde7f4; - background-image: -webkit-gradient(linear, right top, right bottom, color-stop(0, #eaf4fa), color-stop(100%, #b0d9ee)); - background-image: -webkit-linear-gradient(top, #eaf4fa 0, #b0d9ee 100%); - background-image: -moz-linear-gradient(top, #eaf4fa 0, #b0d9ee 100%); - background-image: linear-gradient(to bottom, #eaf4fa 0, #b0d9ee 100%); - -ms-filter: "progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffeaf4fa', endColorstr='#ffb0d9ee' )"; -} -.oo-ui-progressBarWidget-indeterminate .oo-ui-progressBarWidget-bar { - -webkit-animation: oo-ui-progressBarWidget-slide 2s infinite linear; - -moz-animation: oo-ui-progressBarWidget-slide 2s infinite linear; - animation: oo-ui-progressBarWidget-slide 2s infinite linear; - width: 40%; - margin-left: -10%; - border-left: 1px solid #a6cee1; -} -.oo-ui-progressBarWidget.oo-ui-widget-disabled { - opacity: 0.6; -} -@-webkit-keyframes oo-ui-progressBarWidget-slide { - from { - margin-left: -40%; - } - to { - margin-left: 100%; - } -} -@-moz-keyframes oo-ui-progressBarWidget-slide { - from { - margin-left: -40%; - } - to { - margin-left: 100%; - } -} -@keyframes oo-ui-progressBarWidget-slide { - from { - margin-left: -40%; - } - to { - margin-left: 100%; - } -} .oo-ui-selectFileWidget { display: inline-block; vertical-align: middle; @@ -414,20 +352,8 @@ -moz-box-sizing: border-box; box-sizing: border-box; } -.oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-label { - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; - text-overflow: ellipsis; -} -.oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-fileType { - float: right; -} .oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator, -.oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon, -.oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-clearButton { +.oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon { position: absolute; } .oo-ui-widget-disabled .oo-ui-selectFileWidget-info { @@ -438,57 +364,68 @@ -ms-user-select: none; user-select: none; } -.oo-ui-selectFileWidget .oo-ui-selectFileWidget-clearButton { +.oo-ui-selectFileWidget-label { + position: absolute; + top: 0; + bottom: 0; + left: 0; + right: 0; + text-overflow: ellipsis; +} +.oo-ui-selectFileWidget-fileType { + display: none; +} +.oo-ui-selectFileWidget-clearButton { + position: absolute; z-index: 2; } -.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget { +.oo-ui-selectFileWidget-dropTarget { + position: relative; cursor: default; - height: 5.5em; - padding: 0; + height: 8.815em; } -.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-dropLabel, -.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-selectButton { +.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-dropLabel, +.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-selectButton, +.oo-ui-selectFileWidget-dropTarget .oo-ui-iconElement-icon { display: none; } -.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-thumbnail { - height: 5.5em; - width: 5.5em; +.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-thumbnail { + width: 7.815em; position: absolute; - background-size: cover; + top: 0.5em; + bottom: 0.5em; + left: 0.5em; background-position: center center; + background-repeat: no-repeat; + background-size: contain; } -.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-thumbnail.oo-ui-pendingElement-pending { +.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-thumbnail.oo-ui-pendingElement-pending { + background-repeat: repeat; background-size: auto; } -.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-thumbnail > .oo-ui-selectFileWidget-noThumbnail-icon { +.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-thumbnail > .oo-ui-selectFileWidget-noThumbnail-icon { opacity: 0.4; - background-color: #cccccc; - height: 5.5em; - width: 5.5em; + height: 7.815em; + width: 7.815em; } -.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-info { - border: 0; - background: none; +.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-info { display: block; height: 100%; width: auto; - margin-left: 5.5em; + margin-left: 8.815em; + border: 0; } -.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-label { +.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-label { + display: block; position: relative; + top: inherit; } -.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-fileName { +.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-fileName { display: block; + padding-top: 0.5em; padding-right: 2.375em; - overflow: hidden; - text-overflow: ellipsis; } -.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-fileType { - display: block; - float: none; -} -.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-clearButton { - position: absolute; +.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-clearButton { right: 0.5em; } .oo-ui-selectFileWidget-empty.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-thumbnail, @@ -497,7 +434,7 @@ } .oo-ui-selectFileWidget-empty.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-selectButton { display: block; - margin: 0.7em; + margin: 2.2em 1em 1em; } .oo-ui-selectFileWidget-empty.oo-ui-selectFileWidget-dropTarget, .oo-ui-selectFileWidget-notsupported.oo-ui-selectFileWidget-dropTarget { @@ -528,6 +465,12 @@ .oo-ui-selectFileWidget-notsupported.oo-ui-selectFileWidget-dropTarget .oo-ui-buttonElement-button { cursor: no-drop; } +.oo-ui-selectFileWidget-notsupported.oo-ui-selectFileWidget-dropTarget { + height: auto; +} +.oo-ui-selectFileWidget-notsupported.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-label { + padding: 1em; +} .oo-ui-selectFileWidget:last-child { margin-right: 0; } @@ -541,100 +484,110 @@ border-radius: 0.25em 0 0 0.25em; border-width: 1px 0 1px 1px; } -.oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator { - top: 0; - right: 0; - height: 2.3em; - margin-right: 0.775em; -} .oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon { top: 0; left: 0; height: 2.3em; margin-left: 0.3em; } -.oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-label { +.oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator { + top: 0; + right: 0; + height: 2.3em; + margin-right: 0.775em; +} +.oo-ui-selectFileWidget-label { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + left: 0.5em; + right: 2.175em; line-height: 2.3em; margin: 0; overflow: hidden; white-space: nowrap; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; text-overflow: ellipsis; - left: 0.5em; - right: 0.5em; } -.oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-label > .oo-ui-selectFileWidget-fileType { +.oo-ui-selectFileWidget-fileType { color: #888888; + display: block; + margin-top: 0.25em; } -.oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-clearButton { +.oo-ui-selectFileWidget-clearButton { top: 0; + right: 0; width: 1.875em; margin-right: 0; } -.oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-clearButton .oo-ui-buttonElement-button > .oo-ui-iconElement-icon { +.oo-ui-selectFileWidget-clearButton .oo-ui-buttonElement-button > .oo-ui-iconElement-icon { height: 2.3em; } -.oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-info { - color: #cccccc; - text-shadow: 0 1px 1px #ffffff; - border-color: #dddddd; - background-color: #f3f3f3; -} -.oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon, -.oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator { - opacity: 0.2; -} .oo-ui-selectFileWidget-empty .oo-ui-selectFileWidget-label { color: #cccccc; } -.oo-ui-selectFileWidget.oo-ui-iconElement .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label { +.oo-ui-selectFileWidget.oo-ui-iconElement .oo-ui-selectFileWidget-label { left: 2.475em; } -.oo-ui-selectFileWidget .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label { - right: 2.175em; -} -.oo-ui-selectFileWidget .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-clearButton { - right: 0; -} -.oo-ui-selectFileWidget.oo-ui-indicatorElement .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label { +.oo-ui-selectFileWidget.oo-ui-indicatorElement .oo-ui-selectFileWidget-label { right: 4.2625em; } -.oo-ui-selectFileWidget.oo-ui-indicatorElement .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-clearButton { +.oo-ui-selectFileWidget.oo-ui-indicatorElement .oo-ui-selectFileWidget-clearButton { right: 2.0875em; } -.oo-ui-selectFileWidget-empty .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label, -.oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label { +.oo-ui-selectFileWidget-empty .oo-ui-selectFileWidget-label, +.oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-label { right: 0.5em; } -.oo-ui-selectFileWidget-empty.oo-ui-indicatorElement .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label, -.oo-ui-selectFileWidget-notsupported.oo-ui-indicatorElement .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label { +.oo-ui-selectFileWidget-empty.oo-ui-indicatorElement .oo-ui-selectFileWidget-label, +.oo-ui-selectFileWidget-notsupported.oo-ui-indicatorElement .oo-ui-selectFileWidget-label, +.oo-ui-selectFileWidget-empty.oo-ui-indicatorElement .oo-ui-selectFileWidget-label, +.oo-ui-selectFileWidget-notsupported.oo-ui-indicatorElement .oo-ui-selectFileWidget-label { right: 2em; } .oo-ui-selectFileWidget-supported.oo-ui-widget-enabled.oo-ui-selectFileWidget-canDrop.oo-ui-selectFileWidget-dropTarget { background-color: #e1f3ff; } -.oo-ui-selectFileWidget-empty.oo-ui-widget-disabled.oo-ui-selectFileWidget-dropTarget, -.oo-ui-selectFileWidget-notsupported.oo-ui-selectFileWidget-dropTarget { - color: #cccccc; - text-shadow: 0 1px 1px #ffffff; - border-color: #dddddd; - background-color: #f3f3f3; -} -.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget { +.oo-ui-selectFileWidget-dropTarget { background-color: #ffffff; border: 1px solid #aaaaaa; - margin-bottom: 0.5em; vertical-align: middle; border-radius: 0.25em; } -.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-selectButton > .oo-ui-buttonElement-button { +.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-selectButton > .oo-ui-buttonElement-button { border-radius: 0.25em; } +.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-label { + line-height: 1.4; + overflow: inherit; + white-space: normal; +} .oo-ui-selectFileWidget-empty.oo-ui-selectFileWidget-dropTarget { border-style: dashed; } +.oo-ui-selectFileWidget.oo-ui-widget-disabled.oo-ui-selectFileWidget-dropTarget, +.oo-ui-selectFileWidget-empty.oo-ui-widget-disabled.oo-ui-selectFileWidget-dropTarget, +.oo-ui-selectFileWidget-notsupported.oo-ui-selectFileWidget-dropTarget { + background-color: #f3f3f3; + color: #cccccc; + border-color: #dddddd; + text-shadow: 0 1px 1px #ffffff; +} +.oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-info, +.oo-ui-selectFileWidget-empty.oo-ui-widget-disabled .oo-ui-selectFileWidget-info, +.oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-info { + background-color: #f3f3f3; + color: #cccccc; + border-color: #dddddd; + text-shadow: 0 1px 1px #ffffff; +} +.oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon, +.oo-ui-selectFileWidget-empty.oo-ui-widget-disabled .oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon, +.oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon, +.oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator, +.oo-ui-selectFileWidget-empty.oo-ui-widget-disabled .oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator, +.oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator { + opacity: 0.2; +} .oo-ui-outlineOptionWidget { position: relative; cursor: pointer; @@ -785,10 +738,6 @@ .oo-ui-capsuleMultiselectWidget-group { display: inline; } -.oo-ui-capsuleMultiselectWidget > .oo-ui-menuSelectWidget { - z-index: 1; - width: 100%; -} .oo-ui-capsuleMultiselectWidget-handle { background-color: #ffffff; cursor: text; diff --git a/resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css index 8145ef9acd..9632bac829 100644 --- a/resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css +++ b/resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.17.7 + * OOjs UI v0.17.8 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-08-03T16:38:27Z + * Date: 2016-08-16T21:13:53Z */ .oo-ui-draggableElement-handle, .oo-ui-draggableElement-handle.oo-ui-widget { @@ -32,10 +32,6 @@ .oo-ui-draggableGroupElement-horizontal .oo-ui-draggableElement { display: inline-block; } -.oo-ui-lookupElement > .oo-ui-menuSelectWidget { - z-index: 1; - width: 100%; -} .oo-ui-bookletLayout-stackLayout.oo-ui-stackLayout-continuous > .oo-ui-panelLayout-scrollable { overflow-y: hidden; } @@ -186,11 +182,6 @@ .oo-ui-buttonSelectWidget:focus { outline: 0; } -.oo-ui-buttonSelectWidget:focus .oo-ui-buttonOptionWidget.oo-ui-optionWidget-selected .oo-ui-buttonElement-button { - border-color: #347bff; - box-shadow: inset 0 0 0 1px #347bff; - z-index: 2; -} .oo-ui-buttonSelectWidget .oo-ui-buttonOptionWidget .oo-ui-buttonElement-button { border-radius: 0; margin-left: -1px; @@ -204,13 +195,14 @@ border-bottom-right-radius: 2px; border-top-right-radius: 2px; } +.oo-ui-buttonSelectWidget.oo-ui-widget-enabled:focus .oo-ui-buttonOptionWidget.oo-ui-optionWidget-selected .oo-ui-buttonElement-button { + border-color: #347bff; + box-shadow: inset 0 0 0 1px #347bff; +} .oo-ui-buttonOptionWidget { display: inline-block; padding: 0; } -.oo-ui-buttonOptionWidget .oo-ui-buttonElement-button { - position: relative; -} .oo-ui-buttonOptionWidget.oo-ui-iconElement .oo-ui-iconElement-icon, .oo-ui-buttonOptionWidget.oo-ui-indicatorElement .oo-ui-indicatorElement-indicator { position: static; @@ -242,8 +234,9 @@ -moz-transform: translateZ(0); -ms-transform: translateZ(0); transform: translateZ(0); - height: 2em; width: 3.5em; + min-height: 26px; + height: 2em; border: 1px solid #767676; border-radius: 1em; background-color: #ffffff; @@ -281,12 +274,12 @@ transition: border-color 100ms; } .oo-ui-toggleSwitchWidget-grip { - top: 0.35em; + top: 0.3125em; min-width: 16px; - width: 1.2em; + width: 1.25em; min-height: 16px; - height: 1.2em; - border-radius: 1.2em; + height: 1.25em; + border-radius: 1.25em; -webkit-transition: left 100ms, margin-left 100ms; -moz-transition: left 100ms, margin-left 100ms; transition: left 100ms, margin-left 100ms; @@ -362,55 +355,6 @@ .oo-ui-toggleSwitchWidget.oo-ui-widget-disabled .oo-ui-toggleSwitchWidget-grip { background-color: #ffffff; } -.oo-ui-progressBarWidget { - max-width: 50em; - background-color: #ffffff; - border: 1px solid #cccccc; - border-radius: 2px; - overflow: hidden; -} -.oo-ui-progressBarWidget-bar { - background-color: #dddddd; - height: 1em; - -webkit-transition: width 200ms, margin-left 200ms; - -moz-transition: width 200ms, margin-left 200ms; - transition: width 200ms, margin-left 200ms; -} -.oo-ui-progressBarWidget-indeterminate .oo-ui-progressBarWidget-bar { - -webkit-animation: oo-ui-progressBarWidget-slide 2s infinite linear; - -moz-animation: oo-ui-progressBarWidget-slide 2s infinite linear; - animation: oo-ui-progressBarWidget-slide 2s infinite linear; - width: 40%; - margin-left: -10%; - border-left-width: 1px; -} -.oo-ui-progressBarWidget.oo-ui-widget-disabled { - opacity: 0.6; -} -@-webkit-keyframes oo-ui-progressBarWidget-slide { - from { - margin-left: -40%; - } - to { - margin-left: 100%; - } -} -@-moz-keyframes oo-ui-progressBarWidget-slide { - from { - margin-left: -40%; - } - to { - margin-left: 100%; - } -} -@keyframes oo-ui-progressBarWidget-slide { - from { - margin-left: -40%; - } - to { - margin-left: 100%; - } -} .oo-ui-selectFileWidget { display: inline-block; vertical-align: middle; @@ -452,20 +396,8 @@ -moz-box-sizing: border-box; box-sizing: border-box; } -.oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-label { - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; - text-overflow: ellipsis; -} -.oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-fileType { - float: right; -} .oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator, -.oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon, -.oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-clearButton { +.oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon { position: absolute; } .oo-ui-widget-disabled .oo-ui-selectFileWidget-info { @@ -476,57 +408,68 @@ -ms-user-select: none; user-select: none; } -.oo-ui-selectFileWidget .oo-ui-selectFileWidget-clearButton { +.oo-ui-selectFileWidget-label { + position: absolute; + top: 0; + bottom: 0; + left: 0; + right: 0; + text-overflow: ellipsis; +} +.oo-ui-selectFileWidget-fileType { + display: none; +} +.oo-ui-selectFileWidget-clearButton { + position: absolute; z-index: 2; } -.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget { +.oo-ui-selectFileWidget-dropTarget { + position: relative; cursor: default; - height: 5.5em; - padding: 0; + height: 8.815em; } -.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-dropLabel, -.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-selectButton { +.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-dropLabel, +.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-selectButton, +.oo-ui-selectFileWidget-dropTarget .oo-ui-iconElement-icon { display: none; } -.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-thumbnail { - height: 5.5em; - width: 5.5em; +.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-thumbnail { + width: 7.815em; position: absolute; - background-size: cover; + top: 0.5em; + bottom: 0.5em; + left: 0.5em; background-position: center center; + background-repeat: no-repeat; + background-size: contain; } -.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-thumbnail.oo-ui-pendingElement-pending { +.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-thumbnail.oo-ui-pendingElement-pending { + background-repeat: repeat; background-size: auto; } -.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-thumbnail > .oo-ui-selectFileWidget-noThumbnail-icon { +.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-thumbnail > .oo-ui-selectFileWidget-noThumbnail-icon { opacity: 0.4; - background-color: #cccccc; - height: 5.5em; - width: 5.5em; + height: 7.815em; + width: 7.815em; } -.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-info { - border: 0; - background: none; +.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-info { display: block; height: 100%; width: auto; - margin-left: 5.5em; + margin-left: 8.815em; + border: 0; } -.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-label { +.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-label { + display: block; position: relative; + top: inherit; } -.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-fileName { +.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-fileName { display: block; + padding-top: 0.5em; padding-right: 2.375em; - overflow: hidden; - text-overflow: ellipsis; -} -.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-fileType { - display: block; - float: none; } -.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-clearButton { - position: absolute; +.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-clearButton { right: 0.5em; } .oo-ui-selectFileWidget-empty.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-thumbnail, @@ -535,7 +478,7 @@ } .oo-ui-selectFileWidget-empty.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-selectButton { display: block; - margin: 0.7em; + margin: 2.2em 1em 1em; } .oo-ui-selectFileWidget-empty.oo-ui-selectFileWidget-dropTarget, .oo-ui-selectFileWidget-notsupported.oo-ui-selectFileWidget-dropTarget { @@ -566,6 +509,12 @@ .oo-ui-selectFileWidget-notsupported.oo-ui-selectFileWidget-dropTarget .oo-ui-buttonElement-button { cursor: no-drop; } +.oo-ui-selectFileWidget-notsupported.oo-ui-selectFileWidget-dropTarget { + height: auto; +} +.oo-ui-selectFileWidget-notsupported.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-label { + padding: 1em; +} .oo-ui-selectFileWidget:last-child { margin-right: 0; } @@ -585,110 +534,101 @@ height: 2.3em; margin-left: 0.5em; } -.oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-label { +.oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator { + top: 0; + right: 0; + height: 2.3em; + margin-right: 0.775em; +} +.oo-ui-selectFileWidget-label { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; display: block; + right: 2.375em; line-height: 2.3; margin: 0; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; - left: 0; - right: 0; padding-left: 0.5em; } -.oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-label > .oo-ui-selectFileWidget-fileType { +.oo-ui-selectFileWidget-fileType { color: #888888; + display: block; + margin-top: 0.25em; } -.oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator { +.oo-ui-selectFileWidget-clearButton { top: 0; right: 0; - height: 2.3em; - margin-right: 0.775em; -} -.oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-clearButton { - top: 0; min-width: 24px; width: 1.875em; margin-right: 0; } -.oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-clearButton .oo-ui-buttonElement-button > .oo-ui-iconElement-icon { +.oo-ui-selectFileWidget-clearButton .oo-ui-buttonElement-button > .oo-ui-iconElement-icon { height: 2.3em; } -.oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-info, -.oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-info { - background-color: #f3f3f3; - color: #cccccc; - text-shadow: 0 1px 1px #ffffff; - border-color: #dddddd; - cursor: default; -} -.oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon, -.oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon, -.oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator, -.oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator { - opacity: 0.2; -} .oo-ui-selectFileWidget-empty .oo-ui-selectFileWidget-label { color: #cccccc; } -.oo-ui-selectFileWidget.oo-ui-iconElement .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label { +.oo-ui-selectFileWidget.oo-ui-iconElement .oo-ui-selectFileWidget-label { left: 2.875em; } -.oo-ui-selectFileWidget .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label { - right: 2.375em; -} -.oo-ui-selectFileWidget .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-clearButton { - right: 0; -} -.oo-ui-selectFileWidget.oo-ui-indicatorElement .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label { +.oo-ui-selectFileWidget.oo-ui-indicatorElement .oo-ui-selectFileWidget-label { right: 4.4625em; padding-left: 0; } -.oo-ui-selectFileWidget.oo-ui-indicatorElement .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-clearButton { +.oo-ui-selectFileWidget.oo-ui-indicatorElement .oo-ui-selectFileWidget-clearButton { right: 2.0875em; } -.oo-ui-selectFileWidget-empty .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label, -.oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label { - right: 0.5em; -} -.oo-ui-selectFileWidget-empty.oo-ui-indicatorElement .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label, -.oo-ui-selectFileWidget-notsupported.oo-ui-indicatorElement .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label { +.oo-ui-selectFileWidget-empty.oo-ui-indicatorElement .oo-ui-selectFileWidget-label, +.oo-ui-selectFileWidget-notsupported.oo-ui-indicatorElement .oo-ui-selectFileWidget-label { right: 2em; - padding-left: 0; } .oo-ui-selectFileWidget-supported.oo-ui-widget-enabled.oo-ui-selectFileWidget-canDrop.oo-ui-selectFileWidget-dropTarget { background-color: #ebf2ff; } -.oo-ui-selectFileWidget-empty.oo-ui-widget-disabled.oo-ui-selectFileWidget-dropTarget, -.oo-ui-selectFileWidget-notsupported.oo-ui-selectFileWidget-dropTarget { - border-color: #dddddd; - background-color: #f3f3f3; -} -.oo-ui-selectFileWidget-empty.oo-ui-widget-disabled.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-info, -.oo-ui-selectFileWidget-notsupported.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-info, -.oo-ui-selectFileWidget-empty.oo-ui-widget-disabled.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-dropLabel, -.oo-ui-selectFileWidget-notsupported.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-dropLabel { - color: #cccccc; - text-shadow: 0 1px 1px #ffffff; -} -.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget { +.oo-ui-selectFileWidget-dropTarget { background-color: #ffffff; border: 1px solid #cccccc; - margin-bottom: 0.5em; vertical-align: middle; overflow: hidden; border-radius: 2px; } -.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-selectButton > .oo-ui-buttonElement-button { +.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-selectButton > .oo-ui-buttonElement-button { border-radius: 2px; } +.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-label { + line-height: 1.4; + overflow: inherit; + white-space: normal; +} .oo-ui-selectFileWidget-empty.oo-ui-selectFileWidget-dropTarget { background-color: #eeeeee; border-style: dashed; } +.oo-ui-selectFileWidget.oo-ui-widget-disabled.oo-ui-selectFileWidget-dropTarget, +.oo-ui-selectFileWidget-empty.oo-ui-widget-disabled.oo-ui-selectFileWidget-dropTarget, +.oo-ui-selectFileWidget-notsupported.oo-ui-selectFileWidget-dropTarget { + background-color: #f3f3f3; + border-color: #dddddd; +} +.oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-info, +.oo-ui-selectFileWidget-empty.oo-ui-widget-disabled .oo-ui-selectFileWidget-info, +.oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-info { + background-color: #f3f3f3; + color: #cccccc; + border-color: #dddddd; + text-shadow: 0 1px 1px #ffffff; +} +.oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon, +.oo-ui-selectFileWidget-empty.oo-ui-widget-disabled .oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon, +.oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon, +.oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator, +.oo-ui-selectFileWidget-empty.oo-ui-widget-disabled .oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator, +.oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator { + opacity: 0.2; +} .oo-ui-widget-disabled .oo-ui-selectFileWidget-dropLabel { display: none; } @@ -838,13 +778,7 @@ .oo-ui-capsuleMultiselectWidget-group { display: inline; } -.oo-ui-capsuleMultiselectWidget > .oo-ui-menuSelectWidget { - z-index: 1; - width: 100%; -} .oo-ui-capsuleMultiselectWidget-handle { - background-color: #ffffff; - cursor: text; min-height: 2.4em; margin-right: 0.5em; padding: 0.15em 0.25em; @@ -891,7 +825,14 @@ top: 0; margin: 0.3em; } -.oo-ui-capsuleMultiselectWidget:hover .oo-ui-capsuleMultiselectWidget-handle { +.oo-ui-capsuleMultiselectWidget.oo-ui-widget-enabled .oo-ui-capsuleMultiselectWidget-handle { + background-color: #ffffff; + cursor: text; + -webkit-transition: border-color 100ms; + -moz-transition: border-color 100ms; + transition: border-color 100ms; +} +.oo-ui-capsuleMultiselectWidget.oo-ui-widget-enabled:hover .oo-ui-capsuleMultiselectWidget-handle { border-color: #aaaaaa; } .oo-ui-capsuleMultiselectWidget.oo-ui-widget-disabled .oo-ui-capsuleMultiselectWidget-handle { @@ -899,7 +840,6 @@ text-shadow: 0 1px 1px #ffffff; border-color: #dddddd; background-color: #f3f3f3; - cursor: default; } .oo-ui-capsuleMultiselectWidget.oo-ui-widget-disabled .oo-ui-capsuleMultiselectWidget-handle > .oo-ui-iconElement-icon, .oo-ui-capsuleMultiselectWidget.oo-ui-widget-disabled .oo-ui-capsuleMultiselectWidget-handle > .oo-ui-indicatorElement-indicator { diff --git a/resources/lib/oojs-ui/oojs-ui-widgets.js b/resources/lib/oojs-ui/oojs-ui-widgets.js index cd62339005..7a386331fc 100644 --- a/resources/lib/oojs-ui/oojs-ui-widgets.js +++ b/resources/lib/oojs-ui/oojs-ui-widgets.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.17.7 + * OOjs UI v0.17.8 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-08-03T16:38:22Z + * Date: 2016-08-16T21:13:48Z */ ( function ( OO ) { @@ -4770,103 +4770,6 @@ OO.ui.SelectFileWidget.prototype.setDisabled = function ( disabled ) { return this; }; -/** - * Progress bars visually display the status of an operation, such as a download, - * and can be either determinate or indeterminate: - * - * - **determinate** process bars show the percent of an operation that is complete. - * - * - **indeterminate** process bars use a visual display of motion to indicate that an operation - * is taking place. Because the extent of an indeterminate operation is unknown, the bar does - * not use percentages. - * - * The value of the `progress` configuration determines whether the bar is determinate or indeterminate. - * - * @example - * // Examples of determinate and indeterminate progress bars. - * var progressBar1 = new OO.ui.ProgressBarWidget( { - * progress: 33 - * } ); - * var progressBar2 = new OO.ui.ProgressBarWidget(); - * - * // Create a FieldsetLayout to layout progress bars - * var fieldset = new OO.ui.FieldsetLayout; - * fieldset.addItems( [ - * new OO.ui.FieldLayout( progressBar1, {label: 'Determinate', align: 'top'}), - * new OO.ui.FieldLayout( progressBar2, {label: 'Indeterminate', align: 'top'}) - * ] ); - * $( 'body' ).append( fieldset.$element ); - * - * @class - * @extends OO.ui.Widget - * - * @constructor - * @param {Object} [config] Configuration options - * @cfg {number|boolean} [progress=false] The type of progress bar (determinate or indeterminate). - * To create a determinate progress bar, specify a number that reflects the initial percent complete. - * By default, the progress bar is indeterminate. - */ -OO.ui.ProgressBarWidget = function OoUiProgressBarWidget( config ) { - // Configuration initialization - config = config || {}; - - // Parent constructor - OO.ui.ProgressBarWidget.parent.call( this, config ); - - // Properties - this.$bar = $( '
' ); - this.progress = null; - - // Initialization - this.setProgress( config.progress !== undefined ? config.progress : false ); - this.$bar.addClass( 'oo-ui-progressBarWidget-bar' ); - this.$element - .attr( { - role: 'progressbar', - 'aria-valuemin': 0, - 'aria-valuemax': 100 - } ) - .addClass( 'oo-ui-progressBarWidget' ) - .append( this.$bar ); -}; - -/* Setup */ - -OO.inheritClass( OO.ui.ProgressBarWidget, OO.ui.Widget ); - -/* Static Properties */ - -OO.ui.ProgressBarWidget.static.tagName = 'div'; - -/* Methods */ - -/** - * Get the percent of the progress that has been completed. Indeterminate progresses will return `false`. - * - * @return {number|boolean} Progress percent - */ -OO.ui.ProgressBarWidget.prototype.getProgress = function () { - return this.progress; -}; - -/** - * Set the percent of the process completed or `false` for an indeterminate process. - * - * @param {number|boolean} progress Progress percent or `false` for indeterminate - */ -OO.ui.ProgressBarWidget.prototype.setProgress = function ( progress ) { - this.progress = progress; - - if ( progress !== false ) { - this.$bar.css( 'width', this.progress + '%' ); - this.$element.attr( 'aria-valuenow', this.progress ); - } else { - this.$bar.css( 'width', '' ); - this.$element.removeAttr( 'aria-valuenow' ); - } - this.$element.toggleClass( 'oo-ui-progressBarWidget-indeterminate', !progress ); -}; - /** * SearchWidgets combine a {@link OO.ui.TextInputWidget text input field}, where users can type a search query, * and a menu of search results, which is displayed beneath the query diff --git a/resources/lib/oojs-ui/oojs-ui-windows-apex.css b/resources/lib/oojs-ui/oojs-ui-windows-apex.css index 55f891a23c..2f6c1a020b 100644 --- a/resources/lib/oojs-ui/oojs-ui-windows-apex.css +++ b/resources/lib/oojs-ui/oojs-ui-windows-apex.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.17.7 + * OOjs UI v0.17.8 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-08-03T16:38:27Z + * Date: 2016-08-16T21:13:53Z */ .oo-ui-actionWidget.oo-ui-pendingElement-pending { background-image: /* @embed */ url(themes/apex/images/textures/pending.gif); @@ -345,6 +345,7 @@ width: 0; height: 0; overflow: hidden; + z-index: 4; } .oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-active { width: auto; diff --git a/resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css index 0d3976fcce..465e17bdf5 100644 --- a/resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css +++ b/resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.17.7 + * OOjs UI v0.17.8 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-08-03T16:38:27Z + * Date: 2016-08-16T21:13:53Z */ .oo-ui-window { background: transparent; @@ -320,6 +320,7 @@ width: 0; height: 0; overflow: hidden; + z-index: 4; } .oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-active { width: auto; diff --git a/resources/lib/oojs-ui/oojs-ui-windows.js b/resources/lib/oojs-ui/oojs-ui-windows.js index 0e9dbf19fa..510399dc63 100644 --- a/resources/lib/oojs-ui/oojs-ui-windows.js +++ b/resources/lib/oojs-ui/oojs-ui-windows.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.17.7 + * OOjs UI v0.17.8 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-08-03T16:38:22Z + * Date: 2016-08-16T21:13:48Z */ ( function ( OO ) { -- 2.20.1